Merged RestorePackageHelper from develop