Changed form config
Merge branch 'dev'