Merge tag 'v2023.01-rc4' into next