Merge branch 'backport-ci-cuda' into ci-cuda