fix tests
fix #2385
Merge pull request #2419 from digi604/fix-plugin_fallbacks

Fix plugin fallbacks
Merge pull request #2421 from FinalAngel/develop

Develop
Merge pull request #2422 from digi604/fix-2385

fix #2385