Merge branch 'thermal-fix' into release-2.6.27