Merge branch 'thermal-regression' into release