Code

Merge branch 'tc/commit-abbrev-fix'