21b696caf3
resolves CVE-2021-32677 (cherry picked from commit f582fd647537619424e49edbb2fad36c20889194)
resolves CVE-2021-32677 (cherry picked from commit f582fd647537619424e49edbb2fad36c20889194)