Merge "Tackle changing phone numbers by relying on IDs wherever possible."