Dev #15264 upgrade contact form

Ghislain Loas requested to merge dev_#15264_upgrade_contact_form into WIP

Merge request reports