Code

Merge branch 'maint-1.7.0' into maint