Merge branch 'MLAB-416' into 'testing'

Mlab 416

See merge request !31
1 job for testing in 20 seconds (queued for 2 seconds)