Merge branch 'MLAB-671' into 'testing'

MLAB-671

See merge request !160
1 job for testing in 7 seconds (queued for 2 seconds)