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