Merge branch 'MLAB-478' into 'testing'

Mlab 478

See merge request !33
1 job for testing in 15 seconds (queued for 2 seconds)