Merge branch 'cuda_detect_vs_codegen' into release-3.18

Merge-request: !5531