Merge branch 'rs/dir-strbuf'