Merge branch 'maint-1.6.4' into maint-1.6.5