Merge "Fix file stream closing"