Merge branch 'MLAB-208' into 'master'

Mlab 208

See merge request !17
2 jobs for master in 1 second (queued for 3 seconds)