Merge pull request #4542 from mayli/oc-protocol