Merge branch 'MLAB-524' into 'testing'

Mlab 524

See merge request !41
2 jobs for testing in 13 seconds (queued for 2 seconds)