Merge branch 'rs/retire-strbuf-write-fd'