Merge tag 'v2.12.4' into maint