Porting enhancements to package resource
merge package_resource and up version