Merge branch 'dm/update-index-doc-fix' into maint-2.45