(cherry picked from commit 3dc08384) Forward-picking from staging-next. The CVE is marked as critical, and the amount of rebuilds isn't that high (~500 linux, ~100 darwin).