Merge branch 'hotfix/0.6.12'
Merge branch 'release/0.6.13'
fix a typo
Merge branch 'hotfix/0.6.14' into develop