Upstream-commit: a45490243b29f67f09854fdfe355a144d8c3346e Component: engine
Upstream-commit: b06f62713986681c7be5e9e0a59c3f717fe837cd Component: engine