Merge pull request #18838 from eileenmcnaughton/vrenew