Resolve #3556977 "Refactor form helper"

Closes #3556977

Merge request reports

Loading