Merge branch 'hotfix/change-package'
Merge branch 'release/1.1'
Merge branch 'master' into develop