Merge "Fix test failure by ordering leaf-lists"