Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2e326eba7040042e7b4e9974ebd46aaa6b03dc4f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 092315055ae1cd24732b913fad53767328b20678 Component: engine