Merge pull request #13269 from eileenmcnaughton/acltesttrait