Merge branch 'en/rebase-incompatible-opts'