Merge branch 'nd/shared-index-fix' into maint