Merge branch 'MLAB-176' into 'testing'

Mlab 176

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