Merge branch 'fix-streaming-reblog' into 'develop'