wip/mpi-ch/patches
