Merge pull request #16542 from Voorivex/CVE-2026-50229