manual merge of the icmp fix