Updated heat module to stackforge stable/havana

(cherry picked from commit 91383ace0e67f1e5fd44b305347a97d014a3bac6)