Merge "Grants content tests QUERY_ALL_PACKAGES" into rvc-dev