Merge branch 'MLAB-240' into 'testing'

Mlab 240

See merge request !13
1 job for testing in 32 seconds (queued for 2 seconds)