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