Merge "STS fix for CVE-2021-0490" into pi-dev