Re: #1677 - token renewal