Merge branch '68-fix-message-tracker' into 'master'

Fix MessageTracker group counts after deleting messages

See merge request !1166
1 job for master in 8 minutes and 29 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #4027
test

00:08:29