slight modifications to query1 & query3 api implementations
Merge branch '2.0-maint' into 2.1-maint