Merge branch 'MLAB-619' into 'master'

Mlab 619

See merge request !144
1 job for master in 6 seconds (queued for 10 seconds)