Change the internal representation of form dictionary
Merge branch 'form-change-dictionary-refactoring' into form-ui