Merge "Flip order of start/finish" into main