Merge branch 'hotfix-0.12.1' into develop