Merge tag 'v2022.04-rc4' into next

Prepare v2022.04-rc4