Merge back earlier thermal control material for v6.10.