Merge some serialization fixes from the 8 branch
Email verification message