Merge "rebind if the connection drops" into oc-dev