Merge tag 'relase2.0' into develop

v2.0
Merge branch 'develop'
Bug2.0 fixed
Merge branch 'hotfix/bug2.0'