Updates to avoid timing windows in WebSocket eventstream resulting in blocked streams in edge case reconnect scenario#152