Merge "Remove references to Index8"