Merge branch 'maint-1.7.4' into maint