Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 755d3057ab8917c37e33bb5aa60c37cbe51285dd) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 431dc221e3a22b9f97d691dffcc815a5998c0a34 Component: engine