Merge branches 'thermal-tools' and 'thermal-int340x'