Merge remote-tracking branch 'thermal-soc/next'