Merge pull request #2709 from sebv/package-upgrade

wd and yiewd upgrade
test fixes