Merge branch 'MLAB-371' into 'testing'

Mlab 371

See merge request !28
1 job for testing in 10 seconds (queued for 1 second)