Merge branch 'maint-2.9' into maint-2.10