Merge from Perforce
Sniffer the packet in the GRE server, not AP
Restore to old codes