Merge branch 'fix/tootdon-mentions' into 'develop'