Temperature sources now have configurable rates
Fixed merge conflicts