Merge "Validate IDs before persisting carrier name" into main