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