rewrite query9 api
fix bug in query9 correction unit test
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'