[DF-185] Updated image unpacker