Merge pull request #15458 from eileenmcnaughton/excetp