Merge branch 'ra/rebase-i-more-options'