Merge in 1.7 update to master