Merge branch 'MLAB-153' into 'testing'

Mlab 153

See merge request !55
1 job for testing in 11 seconds (queued for 2 seconds)