Merge tag 'v2023.04-rc4' into next