Merge branch 'maint-1.8.2' into maint