Updating source with 1.6.4

Committing source updates performed by Hirvio