Merge branch 'jc/pack-objects-bigfile'