wip/qmc2/patches
