Merge pull request #2668 from lambdageek/dev/monoerror-mono_security