Merge branch 'master' into 'cams2_40'

Master

See merge request !91
3 jobs for cams2_40
in 0 seconds, using 0 compute credits, and was queued for 0 seconds
latest