merge in pack/unpack fork change