backport 17.03.1 CHANGELOG Upstream-commit: 2c1f6e812a5baa0573fb07467a988f71b1c5180b Component: engine