Merge branch 'ta/api-index-doc' into maint