Merge branch 'maint-2.8' into maint-2.9