Content Packaging and other updates