Merge "Revert "Create thermal apex""