Merge pull request #17500 from eileenmcnaughton/renew_can