Merge branch 'rs/use-strbuf-addstr' into maint