Merge branch 'MLAB-340' into 'testing'

Mlab 340

See merge request !85
1 job for testing in 11 seconds (queued for 2 seconds)