remove printouts
Merge branch '2.0-maint' into 2.1-maint
minor change to query1 api impl
Merge branch '2.0-maint' into 2.1-maint