Add COD for mail
Merge remote-tracking branch 'origin/Ver0.11' into Ver0.11