[RFC] Patch backports for CVE-2020-1749