Merge branch 'MLAB-674' into 'testing'

Mlab 674

See merge request !183
1 job for testing in 18 seconds (queued for 2 seconds)