Fix rollback errors
Merge branch 'master' of https://github.com/anantpatil/heat-convergence-poc