Merge branch 'MLAB-672' into 'testing'

Mlab 672

See merge request !173
1 job for testing in 14 seconds (queued for 3 seconds)