Merging latest from master to 1.7 branch