Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next