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