Merge pull request #19872 from eileenmcnaughton/acl_role