Merge branch 'backport-cuda-vs' into cuda-vs