Apptimize to 1.6.4
Merge pull request #8807 from DHowett/master

Apptimize to 1.6.4