Merge branch 'MLAB-253' into 'testing'

Mlab 253

See merge request !50
1 job for testing in 12 seconds (queued for 2 seconds)