Merge "Return error when trying to disconnect twice" into oc-dev