Ming Jin: fix websocket timeout & cluster issue