Merge branch 'hotfix/tests' into develop
style
Merge branch 'release/v0.12.1'