Merge branch 'jc/maint-abbrev-option-cli'