Merge "Fix reorder of UMO in carousel" into main