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