Backported patch for CVE-2020-15503