Merge branch 'release/1.0'
changes
Merge branch 'hotfix/last-things' into develop