us3035 noticed some missing indices while fixing so adding them
Merge branch 'master' into us5977