Merge tag 'v3.12-rc2' into patchwork