Merge branch 'MLAB-202' into 'testing'

Mlab 202

See merge request !25
1 job for testing in 5 seconds (queued for 2 seconds)