Merge "RESTRICT AUTOMERGE" into oc-mr1-dev