Applied the fix for the rogue ThreadLocal