rewrite query5 API implementation in pure embedded API, removing any use of Steps
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'