Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3105ca26dc3dc5273e62dec622b8c40a1ae31b91) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 8299d037ca8e2d2d43de56287d31ffb3d9a6ea98 Component: engine