Merge branch 'int340x-thermal' of .git into next