Merge branch 'nd/index-doc' into maint