Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 263e28a830c7c0ba573f8bb6aa37bee1c3956d22) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 0a234f6a71c8dcecebf5ee32c6784b47ca97872c Component: engine