Merge pull request #2768 from lambdageek/dev/monoerror-cominterop