Merge branch 'MLAB-523' into 'testing'

Mlab 523

See merge request !88
11 jobs for testing in 11 seconds (queued for 1 second)