Support MC + bugfixes.
Merge pull request #4021 from HassenRiahi/MCAndBugFixes

Support MC + bugfixes.