Merge branch 'hotfix/1.0-rc4'
release 1.1