;Switch broadcaster only on suspend
Prevent IllegalStateException
Fix Heartbeat issue with WebSocket
Port fix for #956
Port fix for #954
Port fix for #955