Fix controller plugin config
Merge branch 'bugfix/form-builder-plugin-config'