Merge branch 'jt/doc-pack-objects-fix' into maint