Merge "RESTRICT AUTOMERGE" into oc-dev