Merge branches 'thermal-core' and 'thermal-intel' into next