Merge pull request #2220 from yangfl/packages