Merge branch 'MLAB-367' into 'testing'

Mlab 367

See merge request !66
1 job for testing in 5 seconds (queued for 2 seconds)