Merge branch 'fix/streamer-timeout' into 'develop'