Merge branch 'fr/rebase-i-continue-preserve-options'