Extensions as plugins
Merge branch 'Plugins' into plugins