Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'