Merge branch 'tc/commit-abbrev-fix' into maint