Merge "Query without a subid uses the default subid" into oc-dev