migrated from old package restore way of new one
Merge branch 'right-package-restore' into pretty-func