Merge branch 'lt/default-abbrev'