Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6345208b9b067f19f7792edcc675f59a617a3ca5) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9a4d7bb0e25169fa7d48e24777c683587c29c25a Component: engine