Code

Merge branch 'jn/fix-abbrev' into maint