Pass package metadata through to resolve callback.
Merge remote-tracking branch 'upstream/master' into resolve-with-pkg-metadata