Merge branch 'bugfix/streamer-follows' into 'develop'