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