Merge branch 'sb/strbuf-h-update' into maint