Merge branch 'MLAB-524' into 'testing'

Mlab 524

See merge request !38
1 job for testing in 9 seconds (queued for 1 second)