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