Merge "Revert^2 "Create thermal apex""