Merge 1.7 with master