Remove directoryFinder from plugin list
Merge branch 'master' into dev