Finished add heat states
Merge branch 'dev-heat' into develop