Fix merge issue
Cleanup doesSnitchExist
Merge branch 'master' into dev