Merge "Allow filtering of services" into rvc-dev