Merge pull request #12960 from eileenmcnaughton/member_settings