Merge tag 'v2023.04-rc3' into next

Prepare v2023.04-rc3