Merge branch 'es/rebase-i-no-abbrev' into maint