Merge "RESTRICT AUTOMERGE: Always use safe labels" into oc-dev