Merge branch 'MLAB-671' into 'testing'

Mlab 671

See merge request !158
1 job for testing in 11 seconds (queued for 3 seconds)