Merge branch 'MLAB-383' into 'testing'

Mlab 383

See merge request !70
1 job for testing in 24 seconds (queued for 3 seconds)