Merge branch 'hotfix/V1.0.3' into develop
default email settings !!!
Merge branch 'develop'