wip/mc-mp/patches
