Merge tag 'v2024.04-rc4' into next

Prepare v2024.04-rc4