Merge branch 'develop-ROCSS' into 'master'

Include ROCSS

See merge request !133
1 job for master
in 36 seconds, using 0 compute credits, and was queued for 3 seconds