Merge branch 'MLAB-367' into 'master'

Mlab 367

See merge request !64
1 job for master in 5 seconds (queued for 2 seconds)