Merge pull request #17592 from eileenmcnaughton/junc