Merge pull request #9449 from eileenmcnaughton/member