Merge "Fix bubble reordering issue" into main