Merge branch 'MLAB-26' into 'testing'

Mlab 26

See merge request !42
1 job for testing in 5 seconds (queued for 3 seconds)