Merge pull request #18365 from eileenmcnaughton/member