Updating with final version from Stephen Upstream-commit: 2ba1244ad261a85888ede933267038e362ab1a0f Component: engine