Merge pull request #16397 from eileenmcnaughton/cont_setting3