reordered fields
Merge remote-tracking branch 'upstream/form-builder' into form-builder