Index design changes
Merge branch 'index-design'