Merge "Allow filtering of services" into tm-dev