Merge branch 'hotfix/v.1.0.2' into develop
added cname
Merge branch 'develop'