Merge branch 'MLAB-671' into 'testing'

MLAB-671

See merge request !159
1 job for testing in 9 seconds (queued for 1 second)