Merge branch 'jk/show-branch-strbuf' into maint