Merge pull request #16472 from eileenmcnaughton/cn_for_now