Stack resolver to correspond with CI image 8.6.5

1 job for master in 63 minutes and 28 seconds (queued for 1 second)