Merge pull request #3041 from lambdageek/dev/monoerror-mono_arch_patch_code