Merge branch 'cherry-pick-c26cf70c' into 'testing'

MLAB-669

See merge request !157
1 job for testing in 7 seconds (queued for 2 seconds)