SDE : Modify index
Merge origin/dev into dev