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