V6.4

JD commit