Merge branch 'en/merge-strategy-docs' into maint