Allow unsubscribe when disconnected
Merged origin/master