Merge branch '0.6.4' into dev