Merge branch 'MLAB-26' into 'testing'

Mlab 26

See merge request !41
1 job for testing in 10 seconds (queued for 2 seconds)