Merge branch 'release/0.6.4' into develop