Merge branch 'ew/rev-abbrev'