Merge pull request #15806 from eileenmcnaughton/member_urls