Merge websocket changes

To get this into your PR