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