Merge pull request #11829 from eileenmcnaughton/rules