Merge branch 'MLAB-566' into 'master'

Mlab 566

See merge request !116
1 job for master in 21 seconds (queued for 6 seconds)