Code

Merge branch 'ef/cherry-abbrev'