Upgrade to recommended 1.6.4-R1.0