Merge "Schedule reshuffle"