Merge branch 'MLAB-677' into 'testing'

MLAB-677

See merge request !165
1 job for testing in 8 seconds (queued for 3 seconds)