Improve accuracy of six
byte index methods
#9117
Merged
8000
six
byte index methods
#9117