Merge pull request #18147 from eileenmcnaughton/ex_type