Added Disconnect
Merge branch 'hotfix/Disconnect'