Merge branch 'maint-1.7.5' into maint