Merge branch 'MLAB-175' into 'testing'

MLAB-175

See merge request !13
1 job for testing in 25 seconds (queued for 2 seconds)