Merge branch 'MLAB-223' into 'testing'

Mlab 223

See merge request !26
1 job for testing in 5 seconds (queued for 4 seconds)