Merge branch 'erratic-streamer-test' into 'develop'