Merge #11554 test_email_codecs activation from 3.2.