Merge branch 'MLAB-87' into 'testing'

Mlab 87

See merge request !100
1 job for testing in 25 seconds (queued for 6 seconds)