Merge branch 'release/release_1'
bug fixed
Merge branch 'hotfix/bug1' into develop