Revised snitch entry culling
Merge branch 'master' into dev