Merge tag 'v4.3-rc4' into next