Merge branch 'stream-follow-updates' into 'develop'