Merge branch 'pb/pretty-email-without-domain-part'