Merge branch 'hotfix/rename_map'
Merge branch 'release/0.9.7'
Added client's mail config files.
Merge branch 'hotfix/mail_config' into develop