Merge tag 'v2.9.5' into maint-2.10