Merge "Always force set functions on disconnect" into oc-dev