Merge branch 'MLAB-205' into 'testing'

Mlab 205

See merge request !23
1 job for testing in 4 seconds (queued for 1 second)