Merge pull request #12540 from colemanw/Link