Merge branch 'rs/use-strbuf-add-unique-abbrev'