Merge "Finalize U carrier id version" into main