(cherry picked from commit 796716d44183bd315dd20184a66b39ae533eb747) This is the final commit from the 2.x branch of multiple commits to fix the vulnerabilities CVE-2019-0213 and CVE-2019-0214