Merge with upstream to accommodate with thermal changes