Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev