Merge branch 'do/rebase-i-arbitrary'