Merge "Add length option into ICMP packets"