Merge branch 'maint-1.7.2' into maint