Merge branch 'rs/dir-strbuf' into next