Signed-off-by: Peter Malmgren <ptmalmgren@gmail.com> Upstream-commit: f6896b61ff8142ce22d06ab447f0efdc0addc326 Component: engine