Merge "Implement service filtering" into oc-dev