Merge pull request #3042 from lambdageek/dev/monoerror-upgrade_remote_class