Merge branch 'fix/1794-hashtag-search-results' into 'develop'