Merge "Refine the GTI dump order" into main