Merge changes from topic...

Merge changes from topic "cherrypick-cherrypick-cherrypick-cherrypick-cherrypick-jr-long-cn-9vknr7t5l7-hl6ve8qsmb-ujcwz4szq7-f75lck7d11-7gktw0btjz" into sc-qpr1-dev

* changes:
  [automerged blank] Allow filtering of services 2p: a9c75de2
  Allow filtering of services