Merge branch 'release/0.6.3' into develop
Fix typo
Bump to 0.6.4
Merge branch 'release/0.6.4'