Merge branch 'rs/export-strbuf-addchars'