Merge pull request #19072 from eileenmcnaughton/url