Merge branch 'dev' into 'master'

/e/ features

See merge request e/apps/message!5
1 job for master in 6 minutes and 51 seconds
Status Job ID Name Coverage
  Build
passed #23225
build

00:06:51