Merge branch 'vs-cuda-machine' into release-3.10

Merge-request: !1390