Merge branch 'release/v0.11.8'
Merge branch 'release/v0.12.0'
Merge branch 'develop'
fix tests
Merge branch 'hotfix/tests' into develop