Merge tag 'v2.8.6' into maint-2.9