Merge branch 'dm/pack-objects-update' into maint