Merge branch 'its9817' into 'master'

ITS#9817 Fix test087 set up

See merge request !538
3 jobs for !538 with its9817 into master in 33 minutes and 34 seconds (queued for 44 seconds)
latest