Merge "update websocketmanager"