Merge branch 'layout_cuda_fix' into 'staging'

Layout cuda fix

See merge request !137
7 jobs for staging in 3 minutes and 31 seconds (queued for 1 second)