FOP-3140: Merge form fields
10 files changed