Update changelog on master with changes from 1.12.x Upstream-commit: a4bc730298c8ce422889b0ca6ada03957f2b7273 Component: engine