Merge tag 'v2.10.4' into maint-2.11