Bump CLI to v6.4.0
Merge branch 'crhino-patch-3'