Merge tag 'v4.12-rc3' into next