Merge "Heat Overlapping ip issue"