Merge "Support new package file management scheme - lots of changes" into v2.0