index bug

(cherry picked from commit 74d28c079652f1599bb3bf41dbb12d697f588f2c)
index bug

(cherry picked from commit 078cf140aa218801b99e172f27601617a61a4413)
index bug

(cherry picked from commit 5f55bd804e3f500c699cbaee2dd63581ee145187)
Fixed null indexing test