Index minor changes
Merge