Merge branch 'dev' into 'test'

fix contact us logging

See merge request !55
2 jobs for test in 3 minutes and 26 seconds (queued for 1 second)