included #7067 till it gets pushed to master
forced sniff mode when not disabled to make sure issues around sniff mode get revealed quickly