Merge branch 'MLAB-539' into 'testing'

fixing bug MLAB-539

See merge request !99
1 job for testing in 20 seconds (queued for 3 seconds)