Issue #3583659: Improve custom form components

Closes #3583659

Merge request reports

Loading