Merge branch 'sb/branch-avoid-repeated-strbuf-release'