Merge branch 'hotfix/1.1.1'
Fix broken tests.
Merge branch 'hotfix/fix-broken-tests' into develop