Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1