Merge branch 'hotfix-0.12.10'