Merge branch 'feature/render-mentions-for-tags' into 'develop'