Merge branch 'thermal-core-fix' of .git into next