Before merge
Merge
Fix reload pluginManager