Merge branch 'nd/pack-objects-pack-struct'