Merge 1.12.1 CHANGELOG to master Upstream-commit: 139bf2c98e13db23d9939b4af4dc739c2fa40008 Component: engine