Merge branch 'maint-1.7.1' into maint-1.7.2