Merge "Fix bubble reordering issue" into 24D1-dev