Merge branch 'MLAB-460' into 'testing'

Mlab 460

See merge request !102
1 job for testing in 11 seconds (queued for 2 seconds)