PackageInfo moved inside DictionaryUtil
refactoring
Merge branch 'master' into master-catalogs
more issues