Merge "DataPacketAdapter fix"