update multiscale discretization to current master