Merge "[RESTRICT AUTOMERGE]: STS test fix for CVE-2020-0224" into rvc-dev