Merge branch 'thermal-2.6.33' into release