Merge "Temperature atom: Use int instead of float." into pi-dev