Merge branch 'MLAB-133' into 'testing'

Mlab 133

See merge request !53
1 job for testing in 12 seconds (queued for 4 seconds)