Merge "BUG-2218: Keep existing link augmentations during discovery process"