Update to 6.4.0