Index is overloaded.
Merge branch 'move-index-to-goto' into develop