Merge branches 'fixes' and 'thermal-intel' into next