Merge branch 'MLAB-201' into 'testing'

Mlab 201

See merge request !22
1 job for testing in 9 seconds (queued for 2 seconds)