Merge branch 'hotfix-0.11.3'
Merge branch 'release-0.12.0'
hotfix
Merge branch 'hotfix-0.12.1' into develop