Merge branch 'MLAB-486' into 'testing'

Mlab 486

See merge request !73
1 job for testing in 18 seconds (queued for 1 second)