Merge branch 'MLAB-576' into 'testing'

Mlab 576

See merge request !69
1 job for testing in 47 seconds (queued for 9 seconds)