Merge branch 'hotfix/0.12.9'
Merge branch 'release/0.12.10'
Merge branch 'master' into develop