Merge "Remove underscore from Companion service name" into oc-dev