Merge branch 'nd/doc-git-index-version' into maint