Merge branch 'MLAB-197' into 'testing'

Mlab 197

See merge request !30
1 job for testing in 6 seconds