Merge branch 'MLAB-383' into 'testing'

Mlab 383

See merge request !72
1 job for testing in 17 seconds (queued for 2 seconds)