Code

Merge branch 'lt/default-abbrev' into maint