Merge branch 'MLAB-87' into 'testing'

Mlab 87

See merge request !81
1 job for testing in 12 seconds (queued for 3 seconds)