Addresses https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6250 Github-Pull: #15188 Rebased-From: 3046e5fc01
3046e5fc01