Merge branch 'maint-1.6.5' into maint-1.6.6