Moved some code from UI to core
Add missing plugin in the feature.