Several quickfixes for atmos cooling issues.
Merge pull request #6332 from Zuhayr/dev-freeze

Several quickfixes for atmos cooling issues.