Merge pre-version of plugins with master

Merge pre-version of plugins with master before cleaning