Merge branch 'rs/dir-strbuf-read-recursive-fix'