[MPS/ZH] [65727730] use the same order as Woody