Resolves a build issue
Merge branch 'new-temperature-code' into red-version