Merge branch 'MLAB-469' into 'testing'

Mlab 469

See merge request !94
1 job for testing in 8 seconds (queued for 2 seconds)