Merge branch 'mh/find-uniq-abbrev' into maint