Package changes for index cleanup.
Use legacy index library for legacy support.
Typo
Merge branch 'index-cleanup'