Merge branch 'nd/doc-index-format' into maint-1.8.1