Fix add contact form
Fix conflicts after merging MH-612 to dev
Merge branch 'master' into dev