Merge commit 'origin/mc-4.6'