Merge branch 'MLAB-170' into 'testing'

MLAB-170

See merge request !14
1 job for testing in 10 seconds (queued for 1 second)