Merge branch 'ea/rebase-compat-doc-fix'