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