Carry PR 12008 for contributor Upstream-commit: 65ca20e6f1ee74c3b6b786873d5b7b213d21a0d1 Component: engine