Thanks for doing this - I know there was initial work done to try and fix.
I’ve imported the PR linked in that - as apparently it works around the issue - until a proper fix can be obtained.
The custom builders have this patch applied now - and I’ll have to re-run the nightly builds again to incorporate it soon.