reverted getFormFieldType()
Merge branch 'master' into hotfix