Merge back thermal cotntrol material for v6.10.