Dev #15264 upgrade contact form

Laurent requested to merge dev_#15264_upgrade_contact_form into master

Merge request reports