Merge pull request #23751 from eileenmcnaughton/test_member