Merge "HostTracker Bundle Separation"