Merge "Always call unbind." into oc-dev