Put #1869 in unstable until we can test it or pcap is shared