Merge back earlier thermal core changes for v6.10.