Merge branch 'MLAB-129' into 'testing'

MLAB 129

See merge request !34
1 job for testing in 30 seconds (queued for 3 seconds)