Signed-off-by: Stefan J. Wernli <swernli@microsoft.com> Upstream-commit: d0b9c33f71f1e87e2236f1f9894ce28827791a7a Component: engine