Merge 3.4 (test_email)