Merge tag 'v5.3-rc4' into next