Merge branch 'MLAB-501' into 'testing'

Mlab 501

See merge request !80
1 job for testing in 12 seconds (queued for 1 second)