Merge pull request #13666 from eileenmcnaughton/case_fix