Backport security fix for CVE-2019-7443