Backport fix for CVE-2023-2124