Merge branch '12.0_fix_query_no_return' of git+ssh://github.com/efatt…

Merge branch '12.0_fix_query_no_return' of git+ssh://github.com/efatt… #664