Merge "[Sb refactor] Check groupUuid in subscription filtering" into tm-qpr-dev