Merge branch 'rs/pack-objects-parseopt-fix'