Merge branch 'MLAB-637' into 'testing'

Mlab 637

See merge request !148
1 job for testing in 20 seconds (queued for 1 second)