Merge branch 'mt-mention' into 'develop'

Gathering mentions

See merge request !178 (merged)

(cherry picked from commit 8d2917dd)

d7d761be Gathering mentions works 776ab325 Merge branch 'develop' into 'mt-mention'