Merge pull request #17443 from eileenmcnaughton/renew