Merge branch 'rs/pack-objects-pbase-cleanup' into maint