Merge branch 'release/0.6.4'
Merge tag '0.6.4' into develop