Merge branch 'ml/doc-merge-updates' into maint-2.43