Merge "[RESTRICT AUTOMERGE]: STS bp to mk for CVE-2021-0318" into oc-mr1-dev