Merged Packaging updates