Upstream-commit: 94baf2c5b9b2eb49b554d933f9997da072905d88 Component: engine
Upstream-commit: 814bb505ca5c713941d710566d85294962605317 Component: engine