Update msm_thermal from @franciscofranco