Merge branch 'MLAB-416' into 'testing'

Mlab 416

See merge request !32
2 jobs for testing in 10 seconds (queued for 2 seconds)