Merge pull request #23519 from eileenmcnaughton/cont_parser