Merge tag 'v2024.01-rc3' into next