Merge branch 'MLAB-158' into 'testing'

MLAB-158

See merge request !22
2 jobs for testing in 15 seconds (queued for 3 seconds)