Index repaired
Merge branch 'develop'