Packetizing with binary size (cherry pick from dev)
Fixing packetizing errors still (cherry-pick dev)

Fixed plugin issues