Fixes for: * GHSA-35vc-w93w-75c2 (CVE-2021-29651) * GHSA-fv82-r8qv-ch4v (CVE-2021-29652) Closes #128410.