Merge branch 'bugfix/mentions-timeline' into 'develop'