Merge branch 'MLAB-522-fix' into 'testing'

Mlab 522 fix

See merge request !92
1 job for testing in 11 seconds (queued for 1 second)