Merge branch 'maint-1.7.0' into maint-1.7.1