Merge "STS test update for CVE-2020-0461" into oc-dev