Merge tag 'v4.3-rc3' into next