Code

Merge branch 'jc/maint-pack-object-cycle' into maint