Merge branch 'cuda-arch-version' into release-3.12

Merge-request: !2251