Merge branch 'MLAB-240' into 'testing'

Mlab 240

See merge request !9
3 jobs for testing in 1 second (queued for 2 seconds)