merge changelog for v1.11.1 into master Upstream-commit: feb8f0e10ea151608ed793ec0a88c1a3749f896d Component: engine