Migrate upgrade_3.10.x
to email_supported
#19
Merged
upgrade_3.10.x
to email_supported
#19