Merge branch 'MLAB-667' into 'testing'

Mlab 667

See merge request !151
1 job for testing in 6 seconds (queued for 1 second)