PR: 264618 MFH: 2022Q2 (security blanket) Security: CVE-2022-23935 (cherry picked from commit 37712655)