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