[#3556975] Refactor form helpers

Closes #3556975

Merge request reports

Loading