Merge 1.7 into master