Merge pull request #6250 from systemcrash/extended_icmp