Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com> (cherry picked from commit 4b9db209fe7ed25736244bd2b56faf43a9f908dd) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6099336ae61ca43cafe9420f3188c796cb0812bc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: e4bc7d2fc05fcff4817f39e52b34b17a8f56cd9a Component: engine