Merge pull request #16953 from aaronlehmann/master-security

Add 1.8.3 security fixes to master