Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf