Merge branch 'lb/rebase-i-short-command-names'