Merge branch 'release/v1.0'
fix func1
Merge branch 'hotfix/fun1_fix' into develop