Update path & plugins
Merge