Removed unneeded looping inside PacketManager
Merge branch 'ferrybig'