Merge pull request #19525 from eileenmcnaughton/member_soft