Merge "STS test fix for CVE-2021-0686" into qt-dev