BariCUDA  changes
Merge branch 'marlin_upstream' into jmil_upstream