Addresses https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-13132 and https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15166