Merge pull request #18331 from eileenmcnaughton/refs