Merge branch 'bg/strbuf-trim'