finish refactor the heat states.
Merge branch 'dev-heat' into develop