Merge pull request #20656 from eileenmcnaughton/cont_mode