[v3.4] 916 renew button

Resolves #916 on `release-v3.4`