Merge "Fix STS test for CVE-2021-0399" into oc-mr1-dev