Merge branch '1585-new-messaging-client' into 'master'

Add support for image attachments to messaging client

Closes #1585

See merge request !1133
1 job for master in 8 minutes and 57 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3768
test

00:08:57