Merge changes from topic "am-9d25348074074c5ca73b212e6418c317"

* changes:
  [automerger skipped] Merge "Allow filtering of services" into rvc-qpr-dev am: dc357529 -s ours am: 20ed0011 -s ours am: 0f985d6c -s ours am: 29b763ad -s ours am: 6fe4ae23 -s ours am: a1eebaa8 -s ours am: eeb01cf7 -s ours am: 42dd1eea -s ours
  [automerger skipped] Allow filtering of services am: bbc68b5a -s ours am: f0bc2d6f -s ours am: 29093f27 -s ours am: 098ee9e1 -s ours am: 471c2944 -s ours am: d93f84aa -s ours am: accfda81 -s ours am: 2f8a69a8 -s ours