Merge branch 'kn/snort'