Merge branch 'MLAB-159' into 'testing'

Mlab-159

See merge request !13
1 job for testing in 5 seconds (queued for 1 second)