V7.0

JD commit