Merge "FileSource: FILE is not closed"