Merge branch 'nd/index-errno' into maint-1.7.11