Merge 1.7

Merging 1.7 into master