Merge pull request #10051 from neheb/snor