Merge branch 'streamer-crash-fix' into 'develop'