Merge pull request #21120 from eileenmcnaughton/acl_setting