Merge branch 'MLAB-300' into 'testing'

Mlab 300

See merge request !16
1 job for testing in 10 seconds (queued for 2 seconds)