Merge "HostTracker StaticHost changes"