PluginManager refactoring, fixes #3550
Update deps