Merge pull request #23037 from cudawarped:fix_for_cuda_12