Add 1.8.3 security fixes to master Upstream-commit: eebf88ffd336819ecfdd7bc1206ee7bc8fbfe7ed Component: engine