Merge "Fix file transfer corner cases." into oc-dev