Merge back earlier thermal control updates for 6.17