Merge branch 'heat' into working