Revert "Revert "Merge remote-tracking branch 'remotes/origin/websocket-close'""

This reverts commit efcb45e891b7a7d7b34b235495741bc342a98cd1.