Merge branch 'MLAB-371' into 'testing'

fix 371

See merge request !29
1 job for testing in 9 seconds (queued for 2 seconds)