Merge "Removed heatbridge"