Signed-off-by: Michael Friis <friism@gmail.com> Upstream-commit: 5271a69411e93a2b694c84f7f8216f0d91404e07 Component: engine