Fix race conditions

13 jobs for !98 with slb/ss/sans in 17 minutes and 24 seconds (queued for 6 seconds)
latest merge request