rewrite API queries 6 & 10 to not use traversal framework
Merge branch '2.0-maint' into 2.1-maint