Merge "fix(security): add workaround for CVE-2025-0647" into integration