Merge pull request #18589 from eileenmcnaughton/ex_class