reorder property/relationship read in query3 api impl for performance
Merge branch '2.0-maint' into 2.1-maint