Merge branch 'jk/strbuf-read-file-close-error'