Merge pull request #18357 from eileenmcnaughton/fail