updates from 5.x sniff