Merge branch 'jd7'