Commit of PluginFramework
Merge origin/master