Merge branch 'thermal-int340x'