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

MLAB-669

See merge request !156
1 job for testing in 11 seconds (queued for 1 second)