add hotfix1 by user1
Merge branch 'test-1.0-hotfix1'