Websocket

Merged me5na7qbjqbrp requested to merge websocket into dev

Merge request reports