Merge pull request #16194 from miska/snort3-master