[sr-dev] Merging WebSocket module into master