Merge "fix double closing file descriptors"