Merge branch 'fix/hashtags-streaming' into 'develop'