Merge "API fixes for Companion renaming" into oc-dev