Merge "HostTracker Fixes"