Merge pull request #11954 from eileenmcnaughton/cont