Merge branch 'fix/hashtag-consistency' into 'develop'