Merge "Expose Companion API via shell command" into oc-dev