Merge "Cleanup handle when remote is dead" into oc-dev