Merge branch 'jc/abbrev-guard'