Merge branch 'master' into v1.7
Merge branch 'v1.7'