Merge tag 'v3.12-rc4' into next