Merge branch 'rs/strbuf-remove-fix' into maint