Fix issue with plugin scanner going to deep Upstream-commit: 6e5c2d639f67ae70f54d9f2285f3261440b074aa Component: engine