Merge tag 'v2022.04-rc5' into next