Merge branch 'open-file-leak'