Merge branch 'thermal' into release