Merge branch 'release/1.0'
fixed
Merge branch 'hotfix/some_hot' into develop