Merge branch 'maint-1.7.3' into maint