Merge branch 'cherry-pick-944c8c39' into 'testing'

MLAB-669

See merge request !155
1 job for testing in 6 seconds (queued for 2 seconds)