[v3.4] 916 renew button

Resolves #916 on `release-v3.4`

<!---
@huboard:{"order":461.5,"milestone_order":921,"custom_state":""}
-->