Merge branch 'MLAB-383' into 'testing'

Mlab 383

See merge request !78
2 jobs for testing in 24 seconds (queued for 4 seconds)