Merge pull request from easylogic/feat/new-package renewal package system