Merge "fix(security): optimisations for CVE-2022-23960" into integration