Merge "Add StageOrderOperator to keep track of stages indicies" into main