Merge "RecoverySystem: do not check if socket is closed"