Merge pull request #1055 from AladW/build-pkglist-env