Updated to 6.4 branch