Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 7af4c904b31887e28776cd514e0b8cf8c0261310) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 64a05e3d162b7234f8a7aa32d10434db4c5e6364 Component: engine