Merge branch 'MLAB-173' into 'testing'

MLAB-173

See merge request !19
1 job for testing in 23 seconds (queued for 2 seconds)