Merge branch 'rs/rm-strbuf-optim' into maint