Merge branch 'MLAB-300' into 'testing'

Mlab 300

See merge request !6
1 job for testing in 35 seconds (queued for 4 seconds)