Merge tag 'v2023.07-rc6' into next