Merge branch 'jk/abbrev-auto'