Fix index naming problem.
Merge branch '4.0'