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