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