Merge branch 'mc-4.6'