Merge "Make threadlocals volatile" into main