Code

merge-recursive: cleanup setIndexStages