I still haven't managed to upstream my fixes to our Ivy race conditions