Merge branch 1.7 2