Merge "BUG-625: convert DataPacketAdapter"