Merge branch 'MLAB-383' into 'testing'

Mlab 383

See merge request !79
1 job for testing in 14 seconds (queued for 2 seconds)