Merge branch 'MLAB-87' into 'testing'

Mlab 87

See merge request !83
1 job for testing in 13 seconds (queued for 3 seconds)