Merge branch 'ks/rebase-i-abbrev' into maint