HWS-29: Disconnect added