Merge branch 'release-1-0-6' into develop
Fix bug client pull conflict .
Fix bug client pull conflict .
Merge branch 'release-1-0-7'
Merge branch 'release-1-0-7' into develop
Fix bug client pull conflict .
Fix bug client pull conflict .
Publish version 1.0.7
Merge branch 'release-1-0-7'