Backport fix for CVE-2021-32142