Merge branch 'rs/describe-unique-abbrev' into maint