Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev