Merge branch 'MLAB-258' into 'testing'

Mlab 258

See merge request !48
1 job for testing in 8 seconds (queued for 2 seconds)