PDIO-145 Integrate changes to packager