Merge branch '1907-fix-announce-streaming' into 'develop'