Merge pull request #4115 from dibdot/mc