Merge branch 'thermal-core'