Fix tests after hotfix
Merge
Build
Merge branch 'merge'
Merge
Merge branch 'merge'
Merge
Merge branch 'merge'
Merge
Merge branch 'merge'
Update version