Merge "Fixing update HEAT"