Merge branch 'MLAB-87-TS' into 'testing'

Mlab 87 ts

See merge request !97
1 job for testing in 26 seconds (queued for 3 seconds)