Merge remote-tracking branch 'stevee/mc-update' into thirteen