Merge branch 'rr/doc-merge-strategies' into maint