Client Release 0.6.4.4 - sync to main project

Syncing forked repo