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