Merge tag 'v2.7.6' into maint-2.8