Merge "Change Email2 reference back to Email"