AI-750 : Harmonize layout of field and field type properties
Merge remote-tracking branch 'origin/master'