removed multicompositefield
Merge branch 'feature/component-plugin-upgrade' into develop