redo done
Merge branch 'fix-redo_index' into dev