Merge branch 'bugfix-thermal' into release