Add Heyzap 6.4.0
Merge pull request #8925 from Heyzap/master

Add Heyzap 6.4.0