Merge back thermal control material for 6.4-rc1.