Merge tag 'v2022.01-rc4' into next