Merge pull request #8359 from eileenmcnaughton/ornery_test