Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 05e18429cf50afbc40456a6f4eff1cfd6f1da707) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 673f04f0b1afdb0a1f739b9a4a8b41ea1e015ea4 Component: engine