cherry-pick two patches (updated package generator, added symbol support)