Merge branch 'MLAB-87' into 'testing'

Mlab 87

See merge request !100
2 jobs for testing in 29 seconds (queued for 2 seconds)