Merge branch 'fix_hashtag_search' into 'develop'