Merge tag 'v2022.01-rc3' into next