Merge branch 'MLAB-645' into 'testing'

Mlab 645

See merge request !160
1 job for testing in 9 seconds (queued for 3 seconds)