Merge "Close the FD after opening the file" into sc-dev