Merge branches 'release' and 'thermal' into release