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