- JD updates merged with master