Cherry-pick 1.11.2 CHANGELOG into master Upstream-commit: 73169da9db9ee12b421060eae14377cb6ca372d7 Component: engine