Merge branch 'v1.7'