Merge branch 'maint-1.6.6' into maint