Merge branch 'release-1.0'
hotfix change
fixed merge issue