am c90b5ab2: DO NOT MERGE: allow customization of sniff params

* commit 'c90b5ab247ce9e297e4185444b2e623a799fe447':
  DO NOT MERGE: allow customization of sniff params